Merge latest 9.1.x fixes to main #9580
+103
−64
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.